Bug 516425 – Optionally display accelerators in popups

2008-10-09  Michael Natterer  <mitch@imendio.com>

	Bug 516425 – Optionally display accelerators in popups

	* gtk/tmpl/gtkuimanager.sgml: document the enhanced XML syntax and
	the new enum value for popups with accelerators.

svn path=/trunk/; revision=21616

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 324f7e62fbb6a1cfa80315f0147b06d64dfdcc2b..cd9ee8b534f5f37141c650f1bfe793604c8f90f4 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-09  Michael Natterer  <mitch@imendio.com>
+
+       Bug 516425 – Optionally display accelerators in popups
+
+       * gtk/tmpl/gtkuimanager.sgml: document the enhanced XML syntax and
+       the new enum value for popups with accelerators.
+
 2008-10-07  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtk-sections.txt: add gtk_box_new.

diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml
index a85d3aa26a5e73d6e39825ab4cc730fcbf35065a..b25eaf91c74d7e3e0dd3a1467b72d908384f4c2b 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkuimanager.sgml
+++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml
@@ -32,28 +32,29 @@ Definitions</link>.
 <!ELEMENT toolitem     (menu?) >
 <!ELEMENT separator    EMPTY >
 <!ELEMENT accelerator  EMPTY >
-<!ATTLIST menubar      name                  &num;IMPLIED 
-                       action                &num;IMPLIED >
-<!ATTLIST toolbar      name                  &num;IMPLIED 
-                       action                &num;IMPLIED >
-<!ATTLIST popup        name                  &num;IMPLIED 
-                       action                &num;IMPLIED >
-<!ATTLIST placeholder  name                  &num;IMPLIED
-                       action                &num;IMPLIED >
-<!ATTLIST separator    name                  &num;IMPLIED
-                       action                &num;IMPLIED
-                       expand   (true|false) &num;IMPLIED >
-<!ATTLIST menu         name                  &num;IMPLIED
-                       action                &num;REQUIRED
-                       position (top|bot)    &num;IMPLIED >
-<!ATTLIST menuitem     name                  &num;IMPLIED
-                       action                &num;REQUIRED
-                       position (top|bot)    &num;IMPLIED >
-<!ATTLIST toolitem     name                  &num;IMPLIED
-                       action                &num;REQUIRED
-                       position (top|bot)    &num;IMPLIED >
-<!ATTLIST accelerator  name                  &num;IMPLIED
-                       action                &num;REQUIRED >
+<!ATTLIST menubar      name                      &num;IMPLIED 
+                       action                    &num;IMPLIED >
+<!ATTLIST toolbar      name                      &num;IMPLIED 
+                       action                    &num;IMPLIED >
+<!ATTLIST popup        name                      &num;IMPLIED 
+                       action                    &num;IMPLIED 
+                       accelerators (true|false) &num;IMPLIED >
+<!ATTLIST placeholder  name                      &num;IMPLIED
+                       action                    &num;IMPLIED >
+<!ATTLIST separator    name                      &num;IMPLIED
+                       action                    &num;IMPLIED
+                       expand       (true|false) &num;IMPLIED >
+<!ATTLIST menu         name                      &num;IMPLIED
+                       action                    &num;REQUIRED
+                       position     (top|bot)    &num;IMPLIED >
+<!ATTLIST menuitem     name                      &num;IMPLIED
+                       action                    &num;REQUIRED
+                       position     (top|bot)    &num;IMPLIED >
+<!ATTLIST toolitem     name                      &num;IMPLIED
+                       action                    &num;REQUIRED
+                       position     (top|bot)    &num;IMPLIED >
+<!ATTLIST accelerator  name                      &num;IMPLIED
+                       action                    &num;REQUIRED >
 ]]></programlisting>
 There are some additional restrictions beyond those specified in the
 DTD, e.g. every toolitem must have a toolbar in its anchestry and
@@ -458,6 +459,7 @@ what UI element to create.
 @GTK_UI_MANAGER_TOOLITEM: Create a toolitem.
 @GTK_UI_MANAGER_SEPARATOR: Create a separator.
 @GTK_UI_MANAGER_ACCELERATOR: Install an accelerator.
+@GTK_UI_MANAGER_POPUP_WITH_ACCELS: Same as %GTK_UI_MANAGER_POPUP, but the actions' accelerators are shown.
 
 <!-- ##### FUNCTION gtk_ui_manager_add_ui ##### -->
 <para>